Fix Merge conflict

You'd think no one wanted to run Gingerbread anymore...

Attempt #2.