revert commits 2a25edf2f7f2657356d3da69bef606ef968e8e2c and 6288fdd85f1eba339793e74fb4afd9c8ba4f1c87, because they break local editing