This matches the J(w) mapping changes of r16458.
Authored by: bugman 2012-05-25
Parent: [r16459]
Child: [r16461]