This code was removed in 71cf1aef, but it was
guarded by an "ifndef", not by an "ifdef", so it should still stay (unless I'm
missing something).

Change-Id: Ib344e73d39d1fcd3b84784977769708726d8ed1e