Revert: Remove unused functionality (792e1ca85106210326f4fb58d70a14a6bdb905e6)