Revert "#269 - using include instead of extend for helper methods"

This reverts commit b410c27d3b1dd1b20df259c8fe31a61fb4293029.