REL-1394: Reverted addition of suppress notification flag and used Shane's suggested logic instead.