Feature #3175 #3424: Revert commit:9816b0b