Revert afbd824..ae8b1a6

This rolls back to commit afbd824ae25a44ed5f6a26f024a45654d79da378.
Revert "Data manager"

This reverts commit c3a0f72672b4337a1c6a583a4cef57053f746c48, reversing
changes made to c9d0f21f0dd5444d40fe669819e74eb6649dd037.