Should fix #20

Still not re-enabling: See #22