PS2 fixes the obvious typos/wrong refactoring. This reverts commit e50fa588. Change-Id: I22f81d63a12cf01aafd61535abc2399d936d49c2