Revert "Merge branch 'pr/3'"

This reverts commit 0edaae5da521cf43fd8762270e3b23cfa2680e4d, reversing
changes made to 514da127369b631c21168fe32e418339913ad751.
Revert "Revert "Merge branch 'pr/3'""

This reverts commit 0c43ed04c89f459241bb2f8ed70a0aa38e4b2daa.