Revert 1865625..ecc65de

This rolls back to commit 1865625ad827008eb5b129b08c07b24cf4b5273a.