Revert 2812907..d6ac20c

This rolls back to commit 2812907297878e70285abc2996339c6c800e96cd.