reverting commit 116: this broke the test script
Authored by: sergipujades 2013-05-15
Parent: [r119]
Child: [r121]