Unrelated to this PR, but can we remove line 22 now?