Revert 9bff92d..0e3b803

This rolls back to commit 9bff92d694030349ec7bba5bb3320055c3c15921.