Revert 8c5ef20..97c839e

This rolls back to commit 8c5ef20060026d190c575d07e070b98eacc5770b.