Remove nasty redirect juggling added for 1.0

This also kills an errant debug statement that is too frequent....

Change-Id: I9b8c0d5c95977d8cd7ba1af2eebc61092257634c
Merge "Remove nasty redirect juggling added for 1.0"