Removed weird context dependency.