Revert 38fa606..88fac70

This rolls back to commit 38fa606950a66ec798207bdc1aee8c89aed886ee.