Revert "Bug 1010088 - Use STAGE_DIR consistently on build process" for build bustages

This reverts commit 9c4b99d180313c243b32849c632a1e597a56e16c.