Waiting for sib-core#399 (closed) Closes #17 (closed)
This will create a new commit in order to revert the existing changes.