Revert fede8de..3addbfd

This rolls back to commit fede8de900bdda4aed17576652b2e988a75504a4.