Revert rebase

This reverts commit 7a9aa1f89fba9ca23df6b1a9031ff9b247b9e67c, reversing
changes made to 0e70ea016fefbeae238fa8a3871c01ddfa2dd86c.