Revert "Oops, we didn't want this commit"

This reverts commit be2a72dc0ce168ca69d8aee76e01c279296fce0e.