Revert "In working progress"

This reverts commit bba157bc2d472611d39558072aa927d6577e08ce.