Merge "Disable on stack replacement for now."