Can we maybe get rid of this duplication somehow? Maybe make both return binaries?