Backed out changeset f8c15df3a068 -- Need to re-land with correct commit message.