Revert b629be9..1f77e48

This rolls back to commit b629be9b8fb7996c62500168fc9e246d8d5fba20.