Moved the grep safety nets for INT-649