Revert mistake from previous commit
(cherry picked from commit b04b14e16759fbfa71567aea3ff31531498b6a9e)