Revert 95d6a3f..a979e8d

This rolls back to commit 95d6a3fa4e31f6ec0eb64919e4ebb47ad01caec3.