Follow-up from "Geo integration tests into stable"

The following discussion from !3472 (merged) should be addressed:

• @rymai started a discussion: (+3 comments)

  In the future, should we use a prepend strategy to add EE-specific methods to classes that are in CE?