Revert bfc6044