Revert "PHP20130407"

This reverts commit 7b709567e5b892b1e88b91797e889385bd56d4e7.
Revert "Revert "PHP20130407""

This reverts commit 83675f3e76bcd85c752cf0462ef9175fc5bddbda.