Revert cb10a72..594b2ba

This rolls back to commit cb10a72d42357e6b2f57edd9f039f03d2c54176e.