remove workaround for earlier versions