Revert fd2cb6f..2a8f178

This rolls back to commit fd2cb6f84f90f1d427d926f615c27a0bd167620d.