Don't use Empty directly, let the manager handle it
Merge pull request #3811 from cpennington/ok-dont-use-empty

Don't use Empty directly, let the manager handle it