Revert 5e4ad5a..8fc6f33

This rolls back to commit 5e4ad5a7c3c0ebdfff0218c627812dfbeca2ebfe.
Uptodate structure