Refers to issues #6276, #5973 and #5936 This reverts commit ccd735466524e5cdea353714e06d9a3c88d17bdc.