Revert issue 19