Re-add disgusting hack because it still doesn't start properly.