Fix #756 remove workaround for #755 until something else pops up