Revert "Make max shape sizes more liberal"

This reverts commit 349a40d1ab4675d9034c5e48ca3b57c77b1e5a4a.

Current needs to not merit this change, and any attempt to do so should
really find its way into a config file.