Fix bug 2985.
Streamlining taxonomy