Revert e706698..4684b7b

This rolls back to commit e706698f61cc28a23c8f02fd0b94411aeee81804.