Revert to 407900797b5497282a6f1bc734f10bbe80493692