Move grep safety net for INT-649