Reverting this for now. This commit would better be in a minor release,
since it break everyone's application. Going to reopen the ticket and
mark it to be merged in next minor release.

This reverts commit b7b2b843.