"tmp" setting commented out - see JIRA-1013

(cherry picked from commit 40304bbcfeca78360caa5ba22ab693b6d62632f9)