MAJ 17-10-2014
Revert "MAJ 17-10-2014"

This reverts commit f5d0eb2894019e8ced85a4ce976892a1dd05876e.