Rollback to Original 3.5.1