Remove Foreman hack from 5f3b5857fc94f0237ecd0440069cf34cc6aed86a