Revert 2650c14..fcc01ec

This rolls back to commit 2650c14d3d1b15019fb0469c7d8819af988ff25f.
attempt1

first try to get this stuff up