Revert 737870a..179b77d

This rolls back to commit 737870a243d741304dc268c29fee30b64fc97dc6.