Revert commenting out functions mistake