Fix commits.

Geez, never roll back commits. It really screws things up.