Reverts 0d9656d939 (diff-5c3a1b4da16de002912dd90a78641f32R12) Fixes #229
0d9656d939 (diff-5c3a1b4da16de002912dd90a78641f32R12)