[Bug 21317] Regression