Revert "Merge branch 'origin/pulls/107'"

This reverts commit 82a15dff94ac4f44ac1e554691786bcd776d92df, reversing
changes made to 790a96e7592c239b2f33fa5a0c3e5ebb31b07afc.