Commit 1: Temporary Workaround for Bug #54784