Reverted changes that may have been bugged