Removed the now redundant Q shim.