Switches back from object to tuple implementation.