Revert b3c1343..6878301

This rolls back to commit b3c1343ca1e2321b990293a3ae41521c34d8dd76.