back out -r5.2 since the code DOES NOT WORK with this change!