Fixed bug 19862.

Removed no longer required NET_2_1 conditional blocks.