LPS-50357

Please see comments on https://github.com/natecavanaugh/liferay-portal/pull/2846