Revert 828b612..c83ade3

This rolls back to commit 828b61279108197165e4925f8538cdd04ea9f20a.