Revert 79c65e2..38e66a9

This rolls back to commit 79c65e2ab012190f60e10b3a4b492e780731f238.