Manually undid the pull request from nikelin. It actually introduced homestead pointer issues.