Reverted the unwanted popup fix