Revert "Comment out for now..."