Revert "merge"

This reverts commit a132d88a1d9a5965dfea60b906c9cacbb51887e3, reversing
changes made to 6d9260ec39a350eb10e8febf47b610c1c45708b8.