Revert "Updates from Develop"

This reverts commit b4226716142bb52d45de2dc4a72ab7d8c8ece937, reversing
changes made to db632b7d1cfd104ba327d5a51adf8cef69260f26.