Created by: snehasish
This reverts commit 48db566a which reverted the changes in PR #2940. The changes pushed caused some apps to overflow the modidx field (issue #2956 (closed)). PR #2969 increased the width of the modidx field. We can now safely revert the revert.