Revert "merge of 3.844"

This reverts commit 816cbf2c265f5347ec4f291b8818b8b8f803d6f1.