Temporarily backout 33b673fb5f99 to try and unbreak cedar