Revert "last ditch effort 5"

This reverts commit a34bc4c6669f092195b32133195413db737f3320.