Thanks fatal10110 at gmail.com for the report. The fix is 1.6-only because that code has been refactored in 1.7 (6983201c).