This reverts commit d4fcc692. (This change removed all test coverage from a previous change, also to be reverted.)