Revert 16cd3ae..68fec44

This rolls back to commit 16cd3ae1eba7cb56867430d0bad4ac0335c8291d.
06-10-2014 1419