revert revert of non-breaking commits that got reverted together with a breaking commit