Putting sublayer support back.