This change was already made on master.