Revert "Merge branch 'bchau_branch' into dev"

This reverts commit ded9e0323e0e2f44accb6e0102b09785180a0f03, reversing
changes made to fb6e4820d39906ee74add6b442cc1e7199f0dab2.