This reverts commit 87fee21ef5.
87fee21ef5
glide has its own requirements. My previous workaround caused me some code checkin errors. Need to fix this.