This reverts commit 8f95946b17.
8f95946b17
Sync to tip Co-authored-by: Brannon King <countprimes@gmail.com>