d0b873a4b7
This commit was causing some issues with CI testing, so it's being temporarily removed until that's
resolved.
This reverts commit 8881606cd9.