The change landed in r153612 should be conditional only for 32 bit builds.
*** This bug has been marked as a duplicate of bug 119440 ***