Reverting #2106 -- satisfying lint.