This reverts commit 6a1ccf61. A typo in an assert escaped my local testing thanks to being a release build :/