Revert "Merge pull request #1255 from enyojs/ANG-7045-aarontam"

This reverts commit ca6ba38bf9c6603ca62af8de0156cd2affaa86f6, reversing
changes made to dd48ca5a6bcf35f41fd9b7f249ab32a41bdd2dc4.