#10512: Remove special treatment of shield 917