...and another stupid bug
Merge bug26444 (again)