Workaround #10 / Reverts d785730ea3f5d40cef4eb85dafd4ff867fa45f69