This reverts commit 2bc518dcb2. @namansood didn't end up needing it in his 770aa71ffb.
2bc518dcb2
770aa71ffb