Revert e669e4e..cb3da75

This rolls back to commit e669e4eb79cab9312d4d70f73689dbc50530d8b8.
Version 2.6. going into the wild