Remove Fix for 2544