Created by: EnoahNetzach
I just realized that with #1195 I duplicated some code. This PR just removes it.