Back out last patch based on discussion with Zack