Revert "Get caught up"

This reverts commit 8cba0c8002b2fd1669639170bc79a37204e09983, reversing
changes made to 28c2251697008be88c834ec448b6403fb12c3ce4.