Revert e5d478a..86136c7

This rolls back to commit e5d478a8aef570b9b3259e4eb1371083b5fcda8a.