Revert "upstart woes?"

This reverts commit e18467dcbd15d3ebcfed13bb4f79178abbaa688c.