r=test bustage (fix); removing trailing slug stuff for now