Created by: chwarwick
Reverts update to just in time conversion logic.
This reverts commit 4ae071b5fb8668487f83ec56f4b9fc9c63371a90.
revert