Revert f7b30ed..5d39e41

This rolls back to commit f7b30ed6d7870756adb256f720b2309e45405dc7.
getting ready to submit