Lets split eh (#3120)