Partially revert #a7ba78c