Revert cca9d1fea8 as it introduces problems