Porting issue 12 fixed without using a lookup table (slow fix).
Authored by: skybuck 2011-04-12
Parent: [r5]
Child: [r7]
