Stupid merge conflicts, fix r96537