Case 2480 - Removed dirty hacks.