Revert to 6c5b66500b8331b71e824dbf6d3ad465e781330b
Updates to plugins and changes from server