common : Revert some stuff