Revert "#24"

This reverts commit afef82d6c07f91661a7925a405aba9eabbb56f74.