Reverting change and actually fixing the damn thing