Fix commit from revision 953 which reverted a bunch of changes related to Froyo compa...