Revert billiard API changes.  (Issue #1129)