Revert 7129de5..04f6e7d

This rolls back to commit 7129de550ec2349361117a114d3f3ad23b0d290a.
Correctly remove the defunct versions!