Reverted SelfControl changes