Revert dfba550..d8abe62

This rolls back to commit dfba550a5d7ce3f5e2e048d55d93d969a712fd5c.