Revert b128cbd..db764b3

This rolls back to commit b128cbd3ad938adce5e77e8a1db3fb0c9d7988a0.