Reverts code for #89.