Fix for Bug #63916

This fixes Bug #63916 in a more reasonable way. The changes are compile time macros and I don't see a huge BC concern since I doubt anyone would rely on the old broken behavior. As such I'm sending a PR to PHP-5.3 so it can be merged with 5.4 later going forward.