Revert Tsanko's commit, which breaks build