Revert "pushed on behalf of Jordan"

This reverts commit 406074da42b8844c927478dbb7c9db73c7066e1e.