Revert af327bf..9104f40

This rolls back to commit af327bfcb61ba6a7736e6077777dc63d6abc4a89.