Revert "Take out load-at-startup (doesn't seem to be needed?)"

This reverts commit 53230ff4f959cada288bc1e773671fb73c341292.