Revert 32b163d..cc09cf7

This rolls back to commit 32b163db7fa7727416e9cbd403c98c42b4fba992.