Revert 6d1c7f2..2afaff1

This rolls back to commit 6d1c7f2a91b595607409fe626e6698736ff416d5.
14-10-2014 1720 good