Revert 8ed0670..6315989

This rolls back to commit 8ed06703e78f0f560779c38487410712c508190d.