Applied #e2928c1b32 again (?)