Removed dependency on uecode/uecode-bundle