Revert previous patch, appears to break bootstrap.