Hoping that the finally fix the horrible autorun bug introduced in 2.1.