Oops, last commit included custom_from plugin patches. Pulling that stuff out...