Reverting recent change as traits cannot extend other traits