This was an ugly hack to work around broken dependency modeling. Since the dependencies are now correctly modelled, this hack can be dropped.