Revert d48e275..7688bbe

This rolls back to commit d48e275f761d5b958a04783658a40f1e1910a538.