Revert 819cd1e..dad7c22

This rolls back to commit 819cd1ec411ff421555bea24af7f7af868cb00c0.
201309231057