Revert "Branch prep"

This reverts commit 11cc4647b9fb813cd46b719bce03801148cbc51f.