Revert 7b13756..527dd79

This rolls back to commit 7b137567e29e4bbc014a993a8857a4fb196fc4db.