Revert "Added module incrementing."

This reverts commit cc4957b3770c4a04eb22f0a5ddba2be53c2469c9.

I will keep the master clean and ready to be merged back into the
main fork. This messy incrementing stuff can stay in the dev branch.