Manually reverting some changes which should never have been committed in the first place [ci skip]...