No logic changes should be in here, just moving things around. Signed-off-by: Doug Davis <dug@us.ibm.com>