Revert 35952f9..6da40d0

This rolls back to commit 35952f965c8bfd070e4e417dda46776644cfd437.