Revert 683a0a0..0d10f86

This rolls back to commit 683a0a0fdaf01f05d6df600531c2f45e9e97f16a.