...and again.
Merge bug25749 (again)