I was trying to merge this branch into the wp-cli branch, but couldn't due to these (what I assume to be) accidental changes.