Revert "Merge branch 'master' into losh"

This reverts commit 7ee5d99c7572f80c0fec9bead2749b4f2ea1c8ae, reversing
changes made to ee32087e91388d66b5740154572a5ae4cb541ca1.