Disabled fix to #642 for now.