Revert "Prefer AAT shaping over OT if both available"

This reverts commit 0414341ac576c4403231f507e216c7716c8f0828.
4 files changed