Revert 48fe96b..682115b

This rolls back to commit 48fe96bd86d09ae8a61ed93ba55aeb38e144d290.