Revert 72b0e51..79d8b29

This rolls back to commit 72b0e51c36776c752896f238f4beaa2683df177a.