LPS-43382 Revert changes from LPS-31058 - broken/inconsistent behavior
LPS-43382 Fix inconsistent messages