Revert e10e5ed..71647ea

This rolls back to commit e10e5ed8cb6aee8b1cf96e33cd4651784d52c5ca.
wrong commits cleaned up