Revert "Mako Gamma: allow values greater than 31 for array positions 5 and 6"

This reverts commit 1423385c686ed3c4c5e008af6137dd39b21b5430.