6dd1fdbaf9
This effectively reverts the changes made in [1] to resolve GH-3304. [1] 05ffcf706bff92bdc48f3063d6a64508f8b7674c