Also I feel like we should be able to solve this with a properly injected executor versus a flag (i.e. we inject/enable a SynchronousExecutor vs. a normal one