Revert e040340..a164c2f

This rolls back to commit e0403402dc495ee94afc27d4761fcbea548ff62a.
rolled back to working version