removed workaround for plenty bug on ticket 135428