[#887] revert some of last edit - not baked yet
[#887] revert some of last edit - not baked yet

PaulVanSchayck/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,leesab/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,leesab/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,janiheikkinen/irods,PaulVanSchayck/irods,leesab/irods