Revert 92a7c7e..a50dbc7

This rolls back to commit 92a7c7ea69fd7d99b77848dcb8afc8dc74a8a4b4.