Revert "Merge branch 'pr/4704'"

This reverts commit dc9e3408ff32d5980c6ec267d7694948c2459eef, reversing
changes made to 946b9c3fd10d6aa72883720d1feed54fe6066922.