TW-36043 Revert to build step number
(cherry picked from commit 0f6945a)
fixed test
(cherry picked from commit 1cbe451)