reverted non working fix for #1115