I am not sure what happened there, all the indentation got pwned. This
commit reverts to be identical to the commit before last.
This commit adds the stuff I intended to add.