Fixes #1529.

Completely untested, because I don't think this could possibly interfere with anything. It's a straight revert.