1.6 compatible

@findley 
@data-enabler 
@daheins