fix OnionArchitecture losing optionalLayers after as
#1795
| Job | Run time |
|---|---|
| 3m 56s | |
| 6m 52s | |
| 4m 28s | |
| 2m 4s | |
| 4m 15s | |
| 1m 59s | |
| 14m 34s | |
| 1m 51s | |
| 9m 45s | |
| 4m 11s | |
| 5m 27s | |
| 3m 46s | |
| 9m 1s | |
| 3m 56s | |
| 5m 42s | |
| 3m 42s | |
| 5m 22s | |
| 2m 52s | |
| 2m 48s | |
| 1h 36m 31s |