+ undo changes of 8b610aff on issue 0001375 because this was done in c7e41c