Revert 9f7f76d..8011bc6

This rolls back to commit 9f7f76d1b71bb52fdac5c58085f14e37f34af760.