More cheating

(cherry picked from commit 9a3176d55b0f6815a268c5bf2bcb6042b77f3147)