Revert "Selective merge"

This reverts commit be3b4e74847c722ca9508a0573ec5c0b6b6f38ab.