This reverts commit 28134a29fdedd8972acdfb39223571ddcc15dc59. This patch was causing build failures on multiple buildbots on 32-bit architectures. Reverting now so I can deboug out-of-trunk and resubmit later.
This reverts commit 28134a29fdedd8972acdfb39223571ddcc15dc59. This patch was causing build failures on multiple buildbots on 32-bit architectures. Reverting now so I can deboug out-of-trunk and resubmit later.