partial revert of 01a87c102fe6bdaf3aa48a0ba17219e6e0983c4c which was buggy
partial revert of 01a87c102fe6bdaf3aa48a0ba17219e6e0983c4c which was buggy

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core