Revert 4221c44..07a45f5

This rolls back to commit 4221c44a2898d28ae325718f28e684e1c9961d3d.