Revert "25/03/2013#2"

This reverts commit ad5066c02435211b51b67168cc3449c2f89ff90b.