I guess this should be enabled again, right?