Revert to e2ef785
Fixing messaging for FEND-979