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