Revert "Incorrect function defaults"

This reverts commit 3872dce18064f10afaee41da22e97c743bb77e2f.

This was a spurious change.