Revert "Merge 20121118"

This reverts commit 921cf201c07859db762ab339b7a2fe43f91fa108.