Revert "Merge branch 'sebastienblanc-AEROGEAR-1005'"

This reverts commit 94e23b5c4a7d8fe8608380e21bbda76c74be8bd3, reversing
changes made to 385b782c4c5eb0262a3e98c8c6ba09585077ef3d.