Revert c55f1bc..89a3bd4

This rolls back to commit c55f1bc7ea4cdd8d5663ae01bebc772d3f138fc0.
move wax to vendor