revert mostly

Слиты nikitronn запросил слияние snlit_loadfix в master

Created by: zeffii

resolves #4564 (closed)