Revert "Merge"

This reverts commit ea1502d57431cdfb6ff7aa4ec2aa08d25908b94d.
Revert "Merge branch 'master' into multi_bank_per_instrument"

This reverts commit e39b92f692b0689d0a6141e440aed996c63df556, reversing
changes made to b7d5e10e7abe8f644f102107f1a81c603f7a9197.