Revert "Merge branches"

This reverts commit 8354496aa74b8e692e51ac755ad2fa5eac00b1b6, reversing
changes made to 9bdafad5e45e5103ed644c651aa5ca123652fec3.