Revert "Consolidation"

This reverts commit 2c7140f77a399eeece72c87369976ed03b10afdb.