revert defining  - cherry-picked commit from master branch instead