Revert "Updated methods to fix error from refactoring"

This reverts commit 7a71f771b91d29649e225b3c37bdf07ad22ce9bb.