manually reverted version