This reverts commit 351e3faff8cc2968ce8674bb8ee6108db3e66a35. This was pushed by accident. For now it must stay in bug #285015.