Remove "hacky fix" cause it's obsolete with 4.4.1