fixup! style: Remove glob imports added in #4405