Forgotten import fix

Forgot to include one more import fix in previous PR.
Pull-requesting from the same branch again.