Undoing my optimizations