AUI-789

Haha, my command line function failed me. Here is the real message....

I reverted the changes made by @ericchin in a similar fashion to Nate undo-ing my attempt at fixing LPS-31489. Let me know if you have issues.