Fixes ENYO-381 (master)

Cherry-picking https://github.com/enyojs/onyx/pull/212 into master.