Revert "Merge remote-tracking branch 'korpling/master' into flatquerybuilder"

This reverts commit e816c8b7a02250ef7c8f1677cbd88244b242aa24, reversing
changes made to 39d63b910aa14cec6a3e22e47b5e244ac9b3bfe2.