Revert "Update for 2010-06-01"

Benjamin Mako Hill || Want to submit a patch?