Remove sync path, make callback work everywhere.