This reverts commit 07e40e90. This was meant for a local branch, but accidentally wound up in master. Oops.