Revert "Minor fixes made to improve fault-tolerance"

Created by: amilan

Reverts mxcube/mxcube3#203 Hi, We have detected some issues with this pull request. Please have a look to the comments.