Revert "startup fixes"

This reverts commit ddf776678baa0814b39423c343c857124732fd8c.
...