Reverted patch for 2.1 that brock 2.0