I accidentally included changes in that last commit I did not intend.

This reverts commit 97a63afbcf02df29034eb37b771cf979faa5de96.