Revert "Hector, please stop :D"

This reverts commit 40199c9eea95be70da0d508c5d287de5c1b6422a.

Change-Id: Iaeed5b980c3070383d82fe51e127ae6afe070279