Revert 5e4ad5a..ecda702

This rolls back to commit 5e4ad5a7c3c0ebdfff0218c627812dfbeca2ebfe.