Putting it back and attempting to solve the real problem