Revert to 6d8f07a