Required by BHV-4386

This patch is required for consistency with the BHV-4386 related changes merged into enyojs/enyo#master.