Revert "Merge branch 'merged'"

This reverts commit 3e591cdf57707c05d8bd9ff9e60721f5c47ffa66, reversing
changes made to 183eeb47eecdfffdff4e1fec2bed532cec2dc39b.