Revert dependency on ServerSpec 2