This reverts commit e0ce996e. Reason for revert: Edge extension is likely causing segfaults Change-Id: Id53e4b7e10e0509742bef4b48263b5c58e06baed