holy cow did github mess up the diffs here :p