Revert "Optimized"

This reverts commit 78a053dc1cca7cedcf8fc3bc68dcd6c069a73e11.