removed dabbes hack
merge