Revert the always sync items fix from the last commit, as it was causing issues