LPS-33388

Hi Brian,

I'm re-sending as per your comments on https://github.com/brianchandotcom/liferay-portal/pull/9569.

Cheers,
Laszlo.