Revert 933596e..b0dc689

This rolls back to commit 933596e26f642877dc2e69cf9041109d3f6df831.
rolling back

committed from mac, trying to roll back before I merged