This reverts commit a0f4c10a. This commit hadn't been reviewed yet, and was unintentionally included on another branch.