Actually fixed the bad import this time
Merge branch 'fix-bad-import' into develop