Can't depend on tap-internal dep :-(