Note to self: review diffs and remove temporary changes BEFORE commiting (not after).