Temporarily backout 9d709ee57c7 to try and unbreak cedar