Revert "First pass at porting to Havana"

This reverts commit c2776c3c3612638a713070a2fca07f9092178349.
Merge pull request #19 from vuntz/release/pebbles/master

Revert "First pass at porting to Havana"