Issue #1934130 by brantwynn, ericduran: SPS should not prevent other modules that use Entity API from working correctly.