Revert 26c495e..f3aa40f

This rolls back to commit 26c495ea1cacfdde86acdbc7aa760bdab2289566.