(build) fixing mess caused by rpi hacks