Revert "Fix Max commit"

This reverts commit fb2fc255a85814494e9d1e02499f2e3ff5fa8202, reversing
changes made to 9d731f71b42ad6e6281d9ec8f8245ea572598e69.