Signed-off-by: Austin Seipp <austin@well-typed.com>
(cherry picked from commit b8474812)