Provide pre-1.7 BP compatibility