Built feature for mitigating the previous bug that happened because of
yesterday's rebase