Revert "Merge branch 'master' into BHV-7870-soongil"

This reverts commit ccc484a15a6f8b5cd2a740999e1328915b88696b, reversing
changes made to 8ab13b40d8b0227618b6dacd35ba84502fe76618.
fix JSHint error