Revert "Back to 10.5-supporting configuration."

This reverts commit 1a0cbea84b7a04a7c70761a00514dfbe06ea855a.