Revert "Merge branch 'module-versions'"

This reverts commit ce81ea7a335be42e3f97ff0f24e84e1003c00caa, reversing
changes made to 2eaf5829cc3742dbe3bc7272ad3506864b38d16d.