Add in missing return
Re-enable the default imports again