The original reason this was disabled should be fixed by the previous commit. This reverts commit 1c1b63d6.