Since those two changes do not do anything and this is a stable branch, please undo both.