This reverts commit abbf27e7922cf15df4c74b502e51f4bc12923215.

(committed accidentally, the fix for that ticket isn't ready yet)