Revert 4391f05..b054c83

This rolls back to commit 4391f05b6702029a10fcf71e404e23ed5e1cbf30.