Revert "fix merge"

This reverts commit 75a7b4cf6b2918b95fcda942de90b0111084ae88, reversing
changes made to 4f2410843ccdbcd1d4fb0904ac128af4787a423b.