This reverts commit d01b16a930cfc5a47174d7e24a1742c20f874318. Conflicts: js/common/modules/monkeypatches.js