fix typeo (again) revert a couple changes til i know mroe about them

Change-Id: I1ccba558164fce59bdb6d28bb9a541e0c39a858c