bug 6579 removed boilerplate code