add back more mysterious code deletions
add back more mysterious code deletions

pivotal/whiteboard,mikeymc/whiteboard,pivotal/whiteboard,mikeymc/whiteboard,mikeymc/whiteboard,pivotal/whiteboard,mikeymc/whiteboard,pivotal/whiteboard