This reverts commit 27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888.
Ironically, this change (to fix the build in gingerbread) ended up
breaking the (previously-green) build in master. It probably should
have been marked to not merge. Either way, this fixes the master
build