Temporary fixing, deprecating this module entirely soon