Revert "16-12-2013"

This reverts commit 2369c65a396174c9131237eba8d1d990f2632f36.