Backout e2d962df4128 until we can make that work properly...