Revert "Rely less on undocumented features"

This reverts commit 9adc966aefa548a82ae84d629bc8d26a27c2fc0e.