Revert db60bd5..1bbd900

This rolls back to commit db60bd5bd8aaae26d816c63c7f53cd563ee19c85.