Revert "20130405"

This reverts commit d8f42af8c320b6ac26904ff0533996725bc2daa0.