Revert 8176224..3a1effc

This rolls back to commit 8176224d32f680eb085a3dd5a5d34f56b98a65ba.