Merge branch 'pr/1'
Merge branch 'master' into pr/1
Revert c68ac41..2686dd5

This rolls back to commit c68ac418c788acf2f647f95a5e52f1ef40e6b13e.