bug 1054482 - revert to using autostart