Revert d2 board files to upstream