Removing workaround from old 0.3.1 bug