Hmmm, something went screwy with the rebase here. Let me fix this...