Back out my changes to the fix for my previous checkin, since it broke the inline...