Revert "Fix bad merge of D16791 and D16767"

This reverts commit 839c8ecfcd486f0db82ecb755a137ad95909966f.