Revert eed109a..d3ac0fa

This rolls back to commit eed109a0c26d7c31442e69f406b7ddfd8a554f66.