temporarily fix failing tests by commenting out originally horribly bad code. Needs to be looked at a bit more.
Authored by: mrieser 2014-09-29
Parent: [r30419]
Child: [r30421]
