Undo code deletion from commit f78a0d529adbf57