Reverts change a70d245e89ed1fe24ad0ead3b74fa74fea9c141b (Closes #77)