Revert changes /cc @phamann