remove redundant and typo when porting for ZSS-528 from 2.6.0.FL.20140129.