Regression in patch 21129