Thanks to Paul Hargrove for identifying the issue and suggesting the fix. This commit was SVN r30227.