Revert "ed90a6c2-04da-11e4-a5c3-0015178af5da"

This reverts commit c663720e514433f0a30461d5b283e07cf932fcf2.
da162898-1529-11e4-b98c-0015178af5da