Reverting stupid optimization