@rough-minister-58256: I'm abandoning #2029 in favor of #2060