Revert 0948954..295f49d

This rolls back to commit 0948954edce08438893949f0324993b17c3a4c1e.