Revert "sarah resolve"

This reverts commit e1dc8f003ac3ce21840a2e38ab582ed217af3994.