Revert 0e4c863..4b304a9

This rolls back to commit 0e4c863db36629099d5434342cf6b41db3f3c638.