This reverts commit c78b905811. Rolling back bug 6554 work until we have more comprehensive tests.
c78b905811