Current implementation
Revert "Current implementation"

This reverts commit 27145468f3bc7fba8052f6d8a8ee3ca07569d6dc.