Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit c8c4036b5ac07a7f707e97991be21e83efe84ebe, reversing
changes made to 2dd4382db5aa27eae5bace6b29d5e6f45589cb05.

Conflicts:
	commands.js