Revert "Minor cleanup of obsolete functions."

This reverts commit 93e2f7ebab4da3a4d00fc1d686af40c15b2c8966.