LPS-48383

See https://github.com/jonathanmccann/liferay-portal/pull/320 for some discussion.