#4137 Removing context