LPS-31642 Rollback, will commit better fix
LPS-31642 Better fix