This reverts commit 479fcfdc0bbd97dd0635bbec0273cc25fcf9cc03. It does not build properly as shown in Github Actions.