Ticket #1921: Reverting