Make the hack from r33376 conditional...