fix OnionArchitecture losing optionalLayers after as
#1863
| Job | Run time |
|---|---|
| 4m 11s | |
| 6m 43s | |
| 2m 10s | |
| 4m 11s | |
| 2m 9s | |
| 4m 2s | |
| 13m 7s | |
| 1m 57s | |
| 9m 2s | |
| 4m 31s | |
| 10m 4s | |
| 7m 46s | |
| 3m 59s | |
| 5m 42s | |
| 3m 44s | |
| 5m 22s | |
| 2m 50s | |
| 2m 38s | |
| 3m 9s | |
| 1h 37m 17s |