Revert df0f200..8f76744

This rolls back to commit df0f20041eeba5b48b43777dc7d883d257c1192c.
Revert "Revert df0f200..8f76744"

This reverts commit ba863a334125cf3a66796f69513034f046856470.
commit-30-9-2013-2131