Fixed server hopefully
Revert 7b56bbe..b48b0da

This rolls back to commit 7b56bbecd701c01acb79fe93afcae476e3edc23c.
Silly GravityScore
Merge fix