Revert f13f0b2..3e2a488

This rolls back to commit f13f0b2766ad8d1f9338ee09d49faf85812ee06b.