[Fix Bug 748503] Rewrite for Nightly Redesign