Revert b6c9ca1..9291a20

This rolls back to commit b6c9ca1ab4b9d78b747372ae83c7b30a6a963c94.