Revert "10 June 2013"

This reverts commit 3acd29bd6a941f3283596db65ff8dd3b2753ce93.
Revert "Revert "10 June 2013""

This reverts commit ff61a9f928d39d0f593c40adcd3845fa67e7c349.