Revert 7b25f8d..bd20472

This rolls back to commit 7b25f8df620b0090089f32e941352092cee68a21.