This allows us to optionally use override as we see fit.

(cherry picked from commit 0411517)
(cherry picked from commit ac0b5b7)