reverts one more unrelated commit #2675