This reverts commit 5dda1324. Presumably this was done to work around build errors or something but it works fine now.