Temporarily reverting as it broke python bindings This reverts commit a7262d2d9bee9bdfdbcd03ca27a0128c2e2b1c1a.