2.8.0.1-EXP-MAIN hotfix

A partial rollback of MPS to fix some issues (hopefully) and an update to Logistics Pipes.