Revert "Original commit"

This reverts commit bde8162d7629eea823255575d6c7e9f5da753cab.