I pried r32189 apart to see which chunk of it breaks my compilation. The commit consists of two additions and one change. The two additions compile fine, but as soon as I make the change (attached), I can't compile.
the-chunk.patch
Description: Binary data
