LPS-49677

since the pr at https://github.com/jonmak08/liferay-portal/pull/1061 is taking forever, i pulled the branch and tested it. looks like it works, so if you approve it ill sdh it