Revert to ae12d081ea