Revert "Merge pull request #1266 from enyojs/LEX-BHV-3479"

This reverts commit f925e3b56cc2d055d385016a89272a04431969f9, reversing
changes made to c269c24d9d457b544f826012e83384fd37837020.
Found issues that were occluded by another bug, need to revert this merge.