rolled back to quantum 1.1