Revert 74ad2c1..37a3c30

This rolls back to commit 74ad2c1fc95b74629f6dafec4c74f45589b3c945.