We should apply https://github.com/natecavanaugh/liferay-plugins/pull/242#discussion_r12332125 to these as well.