Revert edbf22c..8c9c3ed

This rolls back to commit edbf22ce6b33e9126b024da27df219661e8ec91f.