Clean up after bug 506427
3 files changed