Reverts 8fc59bd
Made $data optional