revert back to old logic