Actually remove the now-redundant armor flag check in z-ordering.

I can't believe I managed to miss that; this was supposed to be part of #4714.