Revert dc478e049