Revert "Merge branch 'origin/fixes'"

This reverts commit d3a34c9885f48d073afa39e372d82f48ea7a5453, reversing
changes made to 0405fcd92f3d399cc606ee1d5585ac9a5a1760b8.