Revert "Merge branch 'master' of github.com:marcoscaceres/servo"

This reverts commit 0937b9bf9e2ebc271096399b0413c14955a2e888, reversing
changes made to 7e6e6907633518f1575eb2597277ea496417b3d5.