Created by: LawnGnome
Sorry, missed this in #827. I don't think we need to revert it in #828, though.
About to test after merge.