Revert af0d859..c5fc4c1

This rolls back to commit af0d8599e9363849da928c4c6ade47538a44d760.