Revert 738fdb7..0d69275

This rolls back to commit 738fdb7ddf97dfb1c97c1d4aacabb887885362ee.