Revert d2977b9..63c4aa6

This rolls back to commit d2977b9b151f39761611ba7e3daf0592e327f06e.