Move prepopulated fields back to original implementation. This was a workaround for Django >=2.1 & <2.1.4