Reverted changes from last commit: not needed