Revert "Merge pull request #756 from danielmartinez/aragones"

This reverts commit 6f76066ab3cf386e50777fb4a612dd39b25cc62b, reversing
changes made to e1ae7952ebff25094196f93baa6b53c2c12193f7.