Revert bf5ad88d (pushed to a branch)