Removed 5.4.1 fixes.