Revert 6963494..96c6ab8

This rolls back to commit 6963494d57f4dd4c6f7738e19ecfd8a7e8770e2b.
14-11-2014 ok la