I think this should be uncommented after my PR lands