Reverted __exit__() params to original