Revert aed9dc6..ad1c96b

This rolls back to commit aed9dc69b1240de076a6a3d69c109a9e9454dd02.