Revert d35a13e..f716ef7

This rolls back to commit d35a13e5748a3e801f0eae6d24e2fdc17c9b62eb.