src d549de769055 has been reverted in 16-CURRENT. This reverts commit fed06928a23a9331b3f76bd0966f703dd7ba7dcf.