Revert "Matt Code Update"

This reverts commit 8ebbbf3ecde9f542386df2d487bd2bda40c7b746.