Bug 1079893 - remove testing shims - r=bustage