Revert "Nodes from Blocks to contain Taxonomy.Terms"

This reverts commit 6793af091df9ecc2502de1b41ccf0f1ce6de62d9.

As discussed in #438, this may cause too many db hits.