Bug 1028944 follow-up: remove the #ifdef altogether