Created by: courier-new
This reverts commit 0abe9ab6deb0a6b7c88832500364e1bd99afd1db.
This reverts a commit that seemed to start causing test failures.