Hack to make possible stop/start unicorn for now