Created by: lguychard
This reverts commit c2c19c82d7a9f2456074229360b20b9d7c4c4d32.
Fixing the following: