Revert bdd93bd..a90ff20

This rolls back to commit bdd93bda801c64d4aa020d6c017d014b6b7343c3.