Reverted to previous version of #16.