Reverted fc0d56ab0d2b6e37630b7d8bd19101b23ba0d168, which seems to be an accidental merge