@geemus This should be safe now that #2300 was merged.