Revert "Update for increased functionality."

This reverts commit 190181ec5dc6abc7b24586560ffad0ab74ca8904.