Revert "Merge branch 'mike/schematics_update' into 'master'"

Mike Hoang requested to merge revert-15946a5c into master

This reverts merge request !2288 (merged)

Merge request reports