Revert Closure fix