Revert 8d19006..8626437

This rolls back to commit 8d19006ca5124f058b3e42e39506730d289b817c.