revert my hacky fixes for Geo's stuff