This is no longer necessary, see #38