remove workaround for fixed bug 3588