Revert to 6d52c93