BHV-11927: Re-add fix for BHV-10727

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
BHV-11927: Clean-up conditional

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
Merge pull request #806 from enyojs/BHV-11927-aarontam

BHV-11927: Re-add fix for BHV-10727