Revert "1"

This reverts commit e4f0795b14d15fccb6e0a2fbd1d6e2add371fa3d.
Some recent changes in API.