Follow-up: https://enyojs.atlassian.net/browse/ENYO-3821