After talking with abartlet remove the fix for bug 707 again.