Fix windows breakage from 5ed12810e0972b1e due to import cycles

Authored by hvr.