Apply patch per Motion Ticket 2053

https://gist.github.com/alloy/386d5266cb33fd06284e