LPS-46132

Hey Brian,

I'm resending this with the changes suggested in https://github.com/brianchandotcom/liferay-portal/pull/18553

Thanks!