Experimentally switch to use base-jb.xml