Restore changes made by commit 93e4b94