Revert "#3 Roughing in API suggestion from @tkrajacic"

This reverts commit fa58498faf92ef773f8b5e4ca661f936be32c6ed.