Revert 26ba351..6ee1d6b

This rolls back to commit 26ba351dcc1c907811e753a73cc62c3b141f22f8.
Tim clone