Revert "Revert "May 9, 2013""

This reverts commit cd7e05d3906917442676293cd49d7e24b746b170.