This reverts commit c2bc5243. This is supposed to be on master, so revert the reversion. Sorry everyone!