Revert cc016b4..48f99e8

This rolls back to commit cc016b49349273051b9916a1a76c332e404bb0f2.
Caos 2014 v1