Revert "Merge branch 'master' into threemusketeers"

This reverts commit c06b69f63b99b0edb868482ccb4976c94c45290e, reversing
changes made to 8097e3485b1e43b4685bbbbc36ee5060ed7bf4ee.