revert wildcard imports as per Nick's wishes