Follow-up on !1877

In !1877 (closed) @rae suggested and additional refactoring to @RyanGlScott. This ticket is to that this suggestion isn't lost to the sands of time.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information