Revert to commit before accidental merge.