This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: I2dce80e1e1b2116708b6ba9feeacaacc12af8fc4