Revert 13e6a4d..0977e82

This rolls back to commit 13e6a4df28df288b97bf46ece9cef9339799d42f.