Revert Merge with broken team9dev

Authors: lhunker, dbtrue