Revert c1266d0..bf9ce30

This rolls back to commit c1266d0fd064006e9912f35951ec369a0bf17ac7.