Bug 915533 - Remove files that were accidentally restored, r=gyeh