Another attempt to get oil registration working properly.