Revert 86e2d4f..98fa8c3

This rolls back to commit 86e2d4fe9cd654bc44e4a34bf9729120269e6291.