Revert previous change due to conflicts