Re-enable code accedentally disabled in 4ebf2a8f