Bug 968769 - Remove data_layer from base.py's init