This seems to be doing the same thing as what the SUSE block is doing, but in a different way. Or am I missing something? Could we merge the two?