Revert be73eff..e00b9b9

This rolls back to commit be73eff0788548e9fa1f9afdad0d37cf0732dd2b.
f