This reverts commit 65c5a0d9f1. Edge cases were discovered on the pull request post merge.
65c5a0d9f1