Revert "Missed a few explicit versions"

This reverts commit 4e8d25ae027acea60369cdfd8cffaa1b29961202.

Make the build work again.
Revert "Alphabetise"

This reverts commit 3f5cfeff97b6744e75d902d50312bb02e7902bad.

Make the build work again.