This reverts commit bd74ab4acc. This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
bd74ab4acc