removed workaround that is now obsolete