implicit support for code organization change in 1.4rc1