Revert 0d72971..8d6a986

This rolls back to commit 0d729712843f19e97046c21ee76cd96dc75edaf7.