Revert "Added call to update shorthand rollups."

This reverts commit 06acb9f33026294393ff3b6dd320b3e85f3ff47f.
Revert "Merge in feature/updated-core from upstream."

This reverts commit 6283e435c6e6eff368a3928deda20176f0f046f7, reversing
changes made to eb72f568c54064d077e2713314fe7424c0f88311.