Reverting r55898 to r55909. One of these patches was causing an ICE during the full...