Revert "fix merge"

This reverts commit 539897486f32c84065aca273e03af19a5a5b6ab6, reversing
changes made to 907c16e5c6302e4fc48f69d51be7a4b712556b1d.