Case 2651 - Removed hacks.