Revert "Merge commit '0193a1401013f507218ad88425cf6b5706ef86c3' into 1.0-dev"

This reverts commit 6fe06628d996524547f1e875d04f04b9d58504aa, reversing
changes made to ca3d276527aac2e6e6b35a92c580a1505067cbf8.