Fixed 'configuration is not defined' error
Merge fucked up - revering et-utils to whatever roger checked in.