Revert f206aca..c6f1411

This rolls back to commit f206aca52352cd2e24faa496578b61326a17c862.