Revert "ObserveOn Fixes"

This reverts commit 8297c1b393c30ebc43c4d5a3a79cfd41795b62db.