Revert 6fa7bce..bc6857b

This rolls back to commit 6fa7bce3f79cadb7cc9946410975496671f8b59f.
10-10-2014

backup