Reverted changeset r8180, r8181, and r8184 on trunk.