Revert d39dad1..2a1f430

This rolls back to commit d39dad1060f414233341199f13d3c7dfab5d75df.
blah