Revert 56981b4..b2b7c7f

This rolls back to commit 56981b4727e8f1a4c03c67cc33238661e9de7bde.