This reverts commit cad8957e. It breaks NixOps, but more importantly, such major changes to the module system really need to be reviewed.