remove deferring for faster startup (fixes #174)