In preparation for patching how the oracle detection code works, I moved