Revert cf5bff0..c38808f

This rolls back to commit cf5bff0e38eddc3a5dea3d8f027150cd8fc92066.