This reverts commit 724e2431. This (clearly) should never have been committed, and is probably due to a failed stash pop on my part.