Revert a9c5f15..c098072

This rolls back to commit a9c5f15b3301dc87accd05262d92f0f9fdcbeaf6.