Revert ea381d9..9cbd7eb

This rolls back to commit ea381d95bfd710572a9753e8867c83a55f9667c8.