Revert Crossbridge optimizations since the new ones didn't work.