Bug 919669 - Part 1: Switch to Express