CGM, I think you are correct, mass would be independent of gravity.