This reverts commit c1da1a8a16. This is reverted for moving the change out of PR #913 into its own PR for clarity.
c1da1a8a16