LUGG-259 reversing hunks that where accidentally introduced in commit 2342c16