INT-3279-3.0.x: Fix class tangle

JIRA: https://jira.springsource.org/browse/INT-3279