Reverted the changes introduced by the #144 fix to make otris things work for now