Revert 544ba05..c8c407d

This rolls back to commit 544ba05deeac82d01573020e2f4ed4ee06c00aab.