Revert "Support included blocks override"

This reverts commit 33aee12a29426987805420a410e13e0470a79cbf.

This fixes #243.
Added changelog note