Revert "Merge remote-tracking branch 'origin/eddie/muxpack' into xc7mux"