Revert "Merge remote-tracking branch 'origin/Engine' into Executor_Engine"

This reverts commit 5df80d5e097b2564f5b69d533741f6044f95d694, reversing
changes made to 15b6648bb44f71f383248bebed9a4d467a03bfbd.