Revert "Pull Request Fix"

This reverts commit 9cecf2aa53ccd5a498a87dbe787fbeda2e818d0f.