Revert "Removed some experimental code."

This reverts commit ab3ab636e3782d8d7ec6aa1ca65649323ed5a2b7.