Revert ed3d323..507fb86

This rolls back to commit ed3d323ccbd8107f9721ea5799ac6c3fa607d1d0.